[automerger skipped] DO NOT MERGE
am: a096a2ce34  -s ours

Change-Id: Id9f65c5eae11384b6a9f79681a6f55f33b67c493