Merge "Add new key for carrier configuration version"
am: 06dcff96e4

Change-Id: Iaea4aa1e677385cbc1051ec9910bbc85d1c1e944