Merge pi-dr1-dev to aosp-master am: 5989a2f631 am: bd3170f63e
am: 904b90ed01

Change-Id: Idf320de4d786fd204109b65cfa888f4e6c6c44e8