Merge stage-aosp-master into pi-dev-plus-aosp
am: 0d258efbd6

Change-Id: I4870a79482ae5062d8d3007cf6f1e3fbd114aba7