Merge stage-aosp-master into pi-dev-plus-aosp am: 2e1c06cea6 Change-Id: I9bc06a44feaf9ce8e0e54dd16f0cc18ec416f35c