Merge stage-aosp-master into pi-dev-plus-aosp
am: 00d234ee20

Change-Id: I50727bf8e9eba5a09a1ec4bf6310b5153405095a