Updating code to support v1beta15

Reviewed in https://codereview.appspot.com/10617045/