Merge stage-aosp-master into pi-dev-plus-aosp
am: a44cd39d10

Change-Id: If7e797f4c45828b24607ca0ed275dcc9a932063d