[automerger skipped] Merge changes I1f9b7b13,I36bc4a44 am: 17a93d5001  -s ours
am: cc99436c66  -s ours

Change-Id: Icce3dc07b1efda15a0d48ecf78da002102f87bdc