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

Change-Id: I98fc228d876d75a2252530208d88e19c0ee802a1