Merge changes I277fcbc7,Idcf29c93
am: 92fb805602

Change-Id: I4a90cd2f668194a242c04fb30269bc88c2447876