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

Change-Id: Ic2e53d9e00f9733bf8bd27efec341da98377eb77