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

Change-Id: Id22714a3ab72ce5a0b5e1dcd294a7ef7db33da57