[automerger skipped] Merge changes I152d81c7,Id70cdc48 am: 664a78845a am: 30a6ea4cb4
am: 4118c3951f  -s ours

Change-Id: I247e0356779fbdb1e922a81813e6ae124f0989cc