Fixing broken dependencies for updating mw-extensions

Change-Id: Iedf991402e49886e7c39326f4b461dc1eca0a410
Merge "Fixing broken dependencies for updating mw-extensions" into production