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

Change-Id: If2cbff6c6dc53a5e40f20067bdcb4b60febf49aa