Add missing type hints

Change-Id: I1cb04a13d84ca90aec18d557bf5b8e48299c3d99
Merge "Add missing type hints"