Fix for removal of MW 1.17 support

Change-Id: Iacece6b70c7ab122d1feb68075e59690734e8b47