am a4144563: Merge "add disable Ephemeral Network API Bug:18525241" into lmp-mr1-dev

* commit 'a4144563a5bd0e0be4a97fa6e89be6fb455da372':
  add disable Ephemeral Network API Bug:18525241