Merge changes I3a35ed86,I74a9c767 into pi-dev am: 02db955ed8
am: 9aa4b2b3df

Change-Id: I0e26596917735be3e93d77e23f008cfa3c387390