Merge "Add --sync support to push." am: 62db5fcee0
am: d50b10544b

Change-Id: I6a7837f183b81aa207183f249bdb93b9e2899eb5