Merge changes from topic "RestoreDeletedID" into rvc-dev am: 1aa9bb5e20

Change-Id: Ia7f1f79a5cd6d238713f0b107f3e566b4839bd33