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

Change-Id: Ia6b4cc3614e1a7718e50bf18aec7948628414126