Merge "Fix a bug to upload a big entity exceeding 1MB." am: b5909bea2f
am: 87561e810e

Change-Id: I50965ea0ec8266bb8f837ab987c4629b331bd708