[automerger skipped] Merge "DO NOT MERGE"
am: a3fc9da466  -s ours

Change-Id: I7e1fccd49cf8ccacdad3397a3b2756eeaeb0d6d7