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

Change-Id: I2d0d4756003ef63fe7cd824d53169ce758d597ab