Merge pi-dr1-dev to aosp-master am: e6f992a5df am: 8ca0519d1f
am: 60130c16b7

Change-Id: I0685517d3618099819b6a12dfbd31d1dfd65a923