Fix type hint after rename

Change-Id: I41c2d19ae0ece476c77727772d71624be4250c38
Merge "Fix type hint after rename"