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