More migration fixes

Bug: 139825697
Test: Manual
Change-Id: I9a98f2bcee94465a32f6e5335b99d08260871e04
3 files changed