Merge "Don\'t remove existing EAP configurations" into nyc-dev am: c7ad1ac712
am: 7ca542fa99

* commit '7ca542fa99362f15da8d3f57b4916d87c1f67eb3':
  Don't remove existing EAP configurations

Change-Id: I9808325df8d34bb2d08f99b384ff5ad07b6a2273