Merge changes from topic "fcm_version" am: 18e599af8e am: cdc4df4386
am: 94b9c16e55  -s ours

Change-Id: If997f4aa217913dd0cf1465cf2f74585f65f464e