Merge stage-aosp-master into pi-dev-plus-aosp
am: 40a5dc7c6c

Change-Id: I34093e0096610ca7b8232eacf7e3026dea80165f