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

Change-Id: Ib340e213fa93ff7ac2f55c0867409267ec371cc5