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