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