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

Change-Id: Id98a834a1f2ee964340600fad51b29f7fd75c59f