[automerger skipped] Merge changes I02362055,I8ab46fde am: 6d9bf6a207 am: 0d4d187ddc
am: a7f34a4d5a  -s ours

Change-Id: I2fcdc1d0816ca33ebf34c5dedf3f020ba4734ea3