Merge "- keep track of ephemeral configurations that are deleted by user -  make sure we cleaned up prior ephemeral WiFiconfiguration from wpa_supplicant.conf Bug:18525241" into lmp-mr1-dev
tree: 61d0ac7a064ff71ed2c81acd558ac280f6ffffe0
  1. service/