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

Change-Id: Ib23ce84a9b3035b95e16706a4fe95777db014818