Consistently use @return annotation

Change-Id: Ieed9b1ceae43266d81d2df80239b5aeb1af43f58