[automerger skipped] DO NOT MERGE am: b40413839d  -s ours
am: 74af9f7368  -s ours

Change-Id: I06a8466ba9a411fdca1a910e7e59f723672d6048