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