Merge "Update nullability of extension versions in Rollback." into rvc-dev am: 96fc1edd13 am: e848d762b3

Change-Id: I3d577384b4b82d16e9ec99f4e5209662d963bde6