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