Merge "Fix "Add Network" button on SavedAccessPoints page." into oc-mr1-dev am: 85d5d62716
am: 47e2bad574  -s ours

Change-Id: Iebd83628f4aaac64b18e18434c84304f89076e09