[automerger skipped] DO NOT MERGE
am: 35f3525e36  -s ours

Change-Id: I2e4a98b64ef879f56aad1d02ea3dad2ea16bc1c0