Fix return type/comment hint

Change-Id: I98d87f46f66e76a0628e8e2eb903ebf7dda61e75
Merge "Fix return type/comment hint"