Merge changes from topic "fcm_version"
am: 18e599af8e

Change-Id: I54fc554641f19f2513511f24c590fe9506397c76