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

Change-Id: Ib9d7ff7ac34fe73b40a120d6a3901d85ab14f1ab