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

Change-Id: Iff4651fb5791779beb0d760d81f7ded30eb035ab