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

Change-Id: I1af02b6d487fea08793a1dbb6f05a8c61945b318