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

Change-Id: I67b773ba0f0ed66d7512d01551e13fb597c286a8