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

* commit '820ba1f96f5917db98df5b5d36cf5f4b32f50f59':
  add disable Ephemeral Network API Bug:18525241