Consistently use @return annotation

Change-Id: I1f74d34205d03820350b27d7339d2e3c70082aa5