Return correct values and types

Change-Id: Ia069856160aae1ab937daee2da0d6800fe89698f
Merge "Return correct values and types"