Merge stage-aosp-master into pi-dev-plus-aosp
am: 1522ec5c3b

Change-Id: I4b70b4db9dabdeac09cd58befa856f8d9a9f0d3e