Remove static calls to MW code; this is a standalone lib!

Change-Id: I70849a6ad37e5eb26fbee0453e02ad7888cd66d1
Merge "Remove static calls to MW code; this is a standalone lib!"