Merge changes from topic 'Passpoint API Rename' am: 93d66c83cf
am: 322c9a9ec5

Change-Id: I91231f6c6ad804997071f81f0d3998f1d8231a73