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

Change-Id: I4e09aa43dbbfc9e352b321351e9e44230c577bb6