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

Change-Id: I75b3637e093168c7dbdac92a9b579ea7c87113db