Merge pi-dr1-dev to aosp-master
am: e6f992a5df

Change-Id: I4a988a735a0bb1674884af51ab667d6aa3cb5c3f