repo 1.9.0
Fix initial sync broken by sync-c option Change-Id: I308753da8944e6ce5c46e3bfee1bcd41d5b7e292