[automerger skipped] DO NOT MERGE
am: 56bc6a456e  -s ours

Change-Id: Ia7a797a9156188de0f8c4710f25298581d2eaf6d