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

Change-Id: I7ded0273fed30102d67a4e7b8a9e701f09ef9253