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

Change-Id: Iec43972a39d327c3dde27f4aba80ce6c08e633cb