Merge changes I277fcbc7,Idcf29c93 am: 92fb805602
am: 6c0a406956

Change-Id: Ie3b8ce50505f3a561237d5c438de75ef06f32a20