Update function return type hints to go along with code updates

Change-Id: I46f6b4dc23ff48d44d0795b35065925cd5135204