Fix return types in documentation

Change-Id: I726e6201a737ab406dd0e46754d2bbbd95e769b4
Merge "Fix return types in documentation"