Merge changes I819a2942,Ife0607e7 into pi-dev am: 5acc0b1fa3
am: f8b17e22fc

Change-Id: If511f89603733ff5121f02ebc994cc123f84f5b4