Merge pi-dr1-dev to aosp-master am: 92f4c353f4
am: 8bac6c6d15

Change-Id: I6411c3a5e31c2ac6c03d06446efe1c347c847741