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

Change-Id: I9be366c1862160b304d5be0eafc2ae00d6e64957