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