[automerger skipped] Merge changes If834d0f0,I05ec75c7 into pi-dev am: 6d61113df4
am: 096371b719  -s ours

Change-Id: I02b986b97642d6b0e463eececab8f7fccca5d668