Merge "API fix: getProprietaryCallExtras should not return null"