[automerger skipped] DO NOT MERGE am: 42c2f014f2 -s ours am: 778bfd3630 -s ours Change-Id: I977a58c2114e425fba222f6c163026dcae3ceded