Merge changes I90451c14,I9fb27a0a into pi-dev
am: b91dd1d944

Change-Id: I0e33553729a96e597b8e6f8e741b6cae37504175