DO NOT MERGE: Merge commit 'b972321361fdd5d7cc5ee9d92b610c3aeaef6a8c' from oc-support-26.0-dev to stage-aosp-master. am: cc3da80ac4  -s ours
am: 3b9144a101  -s ours

Change-Id: Iebb53cecf53ac05745fc056f2ec6077d8fc03428