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

Change-Id: Ie287a6d49384c8ff9adb4ec9189270abb9fe04c1