Merge pi-dr1-dev to aosp-master am: ba0db3e1e4
am: bbd0a8c46b

Change-Id: Icecfc7e30a33db0b243c6bb63d6c0e91edfe9e81