Merge pi-dr1-dev to aosp-master am: 22cbbb72bc
am: 58b9f75a20

Change-Id: I8f197972658cac79dc6d1d4e0f8ee4be648777e4