Merge "[SP25] Rename functions that add Entry conditionally" am: 2a17338e44

Change-Id: I7e0698f0e60d4c26864ceb728b74a265351a8506
tree: 50694ca759a4b0d6a23ce514c64eec10175330db
  1. Tethering/