Merge "Fix return codes and policy get"