Merge changes I02362055,I8ab46fde
am: 6d9bf6a207

Change-Id: I2029534e1497de66ab94beb1c6683c59240c22e5