Bring Billing API in line with the others.
Merge remote-tracking branch 'upstream/master'