[automerger skipped] [SP24] Rename functions that add Entry unconditionally am: 9f288e6990 am: bf8e5cf064 -s ours
am skip reason: Change-Id I801ddc49e283a254b9586700c9b597c0adb0d459 with SHA-1 9f288e6990 is in history
Change-Id: I55e9099497ae6b5248b3391d438b2ab78857a657
This commit is contained in: