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

Change-Id: If6c73a0e5e2a2d04843c8d0591fc17c2bb2d7add