Merge "Add host feature for `push --sync` support." am: d336a1661c am: 5d0b066f5a
am: 311f93faca

Change-Id: Ie2fd1c50b82c8b3da107e68b5c1f7ad2c1c10def