Merge "Add host feature for `push --sync` support." am: 886e6cac05
am: e2d7a50b69

Change-Id: Ia03072145441e4586c36fb93f073b29ba3288cc3