Merge "Update unit tests for forward delete" into oc-dev am: 995b4a2185
am: 465033c145

Change-Id: I3dc6b1c299d60a5e1aee4e30effa86e665af73e4