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

Change-Id: Id7b0de51a78348b6493e35b80e74078a1f93adfb