Add missing argument and return annotations

Test: manual

bug:128317336

Change-Id: I239b251b15dceb062e7be9ab602f4b0dce446987
3 files changed