Merge changes I88fd4905,Ib8c0a28c
am: 47d00f6c46

Change-Id: I2f2640ad8daa3b2067a297d73b9fd815ad1b2865