Merge stage-aosp-master into pi-dev-plus-aosp am: 25652b6114 Change-Id: I60678636d29766477181be18bcfd85bed349728a