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

Change-Id: I81789db7e6a7978415f345a4ea51519f248b6e24