DO NOT MERGE: Merge commit 'e31a208e36f015ee0fd30e66de304e537f515c28' from merge-oc-support-26.0-dev to stage-aosp-master. am: 915f756d47  -s ours am: 204e9aac8f  -s ours
am: 74de8ccdf6  -s ours

Change-Id: I770c07b93c107933697b01508470fb4c280b3c38