Merge "Fix network name for Passpoint network" am: 742bd03f12
am: a41debeacd

Change-Id: I6cffc06b4d792501fd3cc158cbc119b3c388c9be