Merge changes from topic "mobile-network-setting-migration-0"
am: 750af95669

Change-Id: Iab74630682edc65f206a5e262fe937b9ffff0e6e