Merge pi-dr1-dev to aosp-master am: a7712d7cd7 am: 34a4f7a103
am: a7eecb5f79

Change-Id: I8a23af1edfef203650a4b164175f3a13a0257878