Merge pi-dr1-dev to aosp-master am: c6e29efb1c
am: ef5d477f40

Change-Id: Ib24a2735bbcd50c00a8ba6c1d3d0ee1456426d77