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