Fix WM Version and adding the WM flow.

Change-Id: I0e2ab423b649c2d4c435732400538710699219e8