Add missing references for type hints

Change-Id: I2c82d42f5c4a2e4167a5f9627cfca8f3717dfc13
Merge "Add missing references for type hints"