Add a handful of missing @return

Change-Id: I21b218e6694600a2d2df4dd0a6b2b5cd2e10f1f9