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

Change-Id: Ic131576dbad876c91ec191c3a852d59ca528f6d9