Merge stage-aosp-master into pi-dev-plus-aosp
am: 71fc5ec717

Change-Id: Ic6cb00d77a4565432d66d185a4e3491de1b34468