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

Change-Id: I7257eb5eaf7fcb1db2a289c9b21775d11535f210