[automerger skipped] Merge changes from topic "b/121448199" into pi-dev
am: de18a38e31 -s ours
am skip reason: change_id Id8b58d9ccd3f62c976d1292575a06554bef622a4 with SHA1 d215b8218d is in history

Change-Id: I5036b58bd80cd41740d02186f3dd4ebdbbe89214