Merge "Fix "import xx as xx" grammer"