revert to AOGP-Devices from CM