Merge pi-dr1-dev to aosp-master am: 394eb13546
am: b12ac32195

Change-Id: Ic5044793f23ba7a7290ac4cff1f622a13f3ddd26