Merge changes from topic "fcm_version" am: 18e599af8e
am: cdc4df4386

Change-Id: I42ec40890d976cd70194fa0a9af0e28009c9a696