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