Merge stage-aosp-master into pi-dev-plus-aosp am: 7a45532b02 Change-Id: I9ad41e14ef3d6680336217948b3fd5327355b160