[automerger skipped] DO NOT MERGE am: baf1738747  -s ours am: 85dd752516  -s ours
am: 1188fe0993  -s ours

Change-Id: Ibb2bcf09191c13fb01a6c5f82284f162d35ba0a1