Merge changes I9876ff6b,Iccd7c1c1 into pi-dev
am: b914565f6a

Change-Id: I4fae1442aca58e45b98f18294b842697dc36dfb6