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

Change-Id: I49cc07975bba4673aa091cd9fb41b649c42bf03b