More verbose logging and checking for migrateAccount.

Change-Id: Idf09768908e9dacf9cd1830862830d9c6589e29c