Merge changes I5c3e1625,I51fc5cb2 am: 3eb4eee4c9 am: 3477dfc201

Change-Id: Id6138fcaf7c6c965dccf41a5737e94c6a7223db9