Merge "Rpc manager not needed to instantiate DeviceManager"