Merge pi-dr1-dev to aosp-master
am: 90bffdfe8e

Change-Id: Ibbf18cd2d8a70737dec3c1021c2a12ba8ee0733a