Android CTS 8.0 Release 12 (4890494)
merge in oc-release history after reset to oc-dev