Merge pi-dr1-dev to aosp-master
am: 068de27a39

Change-Id: I55bc1407d9e766d3eb48fc4881fa4db4373c6f9d