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

Change-Id: I072198acd59558bfd730c22c92cc5fb1e00e2382