Workaround for possible bug in Apiary Datastore Server

R=sgjesse@google.com

Review URL: https://codereview.chromium.org//694713003