Merge "db845c: update FCM version to 7" into main