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

Change-Id: Ib7b6733b31e92ccc92f41e93e7536deed590af29