Merge "Add support for push --sync." am: f2c70658d9
am: 9b35dd6f2e

Change-Id: Ie097db907327aec3d6681df1403e8100665d3af0