Merge changes I4c3a967c,I3fd5732f into pi-dev
am: 17368c3f62

Change-Id: I3ef9e9b534e13d6822d3271b40ab0573371b38f0