Merge changes from topic "RestoreDeletedID" into rvc-dev am: 1aa9bb5e20 am: 61c19a3241 am: 5bfa055027 am: 84606744d8 am: 45577f457b

Change-Id: Id2e523d1b2999c8f0f32e832163b3e2edb5e85c1