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