This reverts commit 962a4ed9. Reason for revert: others' tests aren't migrated. Change-Id: I12bcf3e462c7869585e810d5f5b2c45bfe221323