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

Change-Id: I1f4e980eb33127e890f640421f0851ed6479f33a