Merge pi-dr1-dev to aosp-master

Change-Id: I5d9258cdbcf160849cc159d017fd97ec5e6211ce