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

Change-Id: I5e369165d72e99e76806ecf658943ada3106221c