[automerger skipped] DO NOT MERGE
am: 00d3d7ee38  -s ours

Change-Id: I7dfd2493a9e3efa93c82540438ff955a2771be70