Merge "Avoid getWithSetCallback() warnings on unversioned key migration"