Fix several type hints
Follow up for Ibeafa30.
Bug: T303786 Change-Id: Ibbd3620dbc303b8d61a4ca6f7fa38671bc26493d