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

Change-Id: Ia93e646313acf0e386d34b5e84a42414d62d88af