Merge changes I11859ee8,Id17d1c87
am: b4d69e67a1

Change-Id: I8e4e92e67caebb41c71ce5ea7e9c905b2fa8d607