Merge changes Id98050c5,Ib60bb047 am: 08d36d87bc
am: 00dfa0005f

Change-Id: I1fa1e69f8e11fef194aef647742ae62b8c21e688