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