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

Change-Id: I7ff83844091437c9c78892a758d6ff657c101585