Merge stage-aosp-master into pi-dev-plus-aosp am: 67a3f5f129 Change-Id: If1a09fd25734e3ef938e9772622626a67a9960a9