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