Merge "device FCM -= android.*" into main