Merge changes Iff142ccd,I724080ed into pi-dev
am: 7844159deb

Change-Id: Ia02e8c988b97023079c3bfac57da338b64d3dd37