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