Merge pi-dr1-dev to aosp-master am: efd99ec863
am: f031881128

Change-Id: I303729613971ba064cf0ceaffc05238490bcc5dd