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

Change-Id: I4d2b48b9312e61677195893636eb73b87c151d07