Merge stage-aosp-master into pi-dev-plus-aosp
am: 391951aa1e

Change-Id: If6b26e73b5e1bccede91bd91da07bf627ea96dbe