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

Change-Id: Ie1e565d1a90e1b514a669691108bbc9d85dc7b50