Merge remote-tracking branch 'origin/pi-dev.bak' Bug: 111553225 Change-Id: Idd5e44cf8d16447b2ccf736209218f912ef63d5a