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

Change-Id: Idc9e02ae6c792194db32070557ad3921aceca49d