Merge changes Idca52b94,I82ae308d into pi-dev am: bb96c13c70
am: 20c37dd6c7

Change-Id: I6c13b04db380d7d536cbdc23283d04482fcc6825