Sync w at the same time as docroot

Change-Id: I3904d81fc094969900c3adce2b89ec79d119c250