Android CTS 8.0 Release 24 (6676658)
merge in oc-release history after reset to master