Merge pi-dev-plus-aosp-without-vendor into stage-aosp-master
am: 92bb68c74b

Change-Id: I9c048bb417fe04853f8ffea7513093e46d52f212