Improve type hint

Change-Id: Ic42c1a0d19432301e89e52950af037526bb77ad3
Merge "Improve type hint"