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