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