[automerger skipped] DO NOT MERGE am: 00d3d7ee38 -s ours am: 526ee8da65 -s ours Change-Id: Ic54b4dccd5aedc6cf7d56fe9e8c4b64cad0b6908