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

Change-Id: I7b2c6c34df7059b1faa5e23c3550a22055668014