Type hints. Fixup missing return values

Fixes bug: 42462

Change-Id: I879feacba211ac3cfd1eb55629300b78ef2e4c0c