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

Change-Id: I5b0e49520648bbd61cb3b06ca880c4095adb6011