Merge upstream-pi-dev to pi-dev.
am: ec6e66ae23

Change-Id: I2081d5286fc3e6119dfb8f24f09979c3459851fd