Merge stage-aosp-master into pi-dev-plus-aosp
am: 6fffad0bae

Change-Id: I1957ea8d62f72bf4586f3232694477a7186fee08