Merge stage-aosp-master into pi-dev-plus-aosp am: bbeb4eaca4 Change-Id: I6bbd146c8bd5327e3fcbdfcc0d192635bfba030b