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

Change-Id: I6e2094d7d47b96878baaf4e460286a9670147e58