Merge "Fix return value." into gingerbread