Merge "Create URIs for WFC user settings in SIMINFO" am: 930ee7357a am: 45bb4c90bf
am: 6d375568b7

Change-Id: I6b30502e74ac527cc4aa50cf5a8d15d7a4059803