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

Change-Id: I7e0698f0e60d4c26864ceb728b74a265351a8506