Merge changes I478047cc,Ibe16ffd7 into pi-dev
am: 892ee93977

Change-Id: Id60ec23a210c907bf61a4f0c95441e5f48b773cc