tree f785f47563936d954aa0f854aa6e1db36cbb7a0d
parent ab4686f7087e546c8989ea728f2c2b26b91e76e1
author Roberto Perez <robertoalexis@google.com> 1566494933 -0700
committer Roberto Perez <robertoalexis@google.com> 1566519887 -0700

More migration fixes

Bug: 139825697
Test: Manual
Change-Id: I9a98f2bcee94465a32f6e5335b99d08260871e04