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

Change-Id: I20e0710e94b56c119ec72edbbb9caa2eb2c96f41