Removed MW 1.16 compatibility, added MW 1.21+ compat

Change-Id: Iea06c713c8615ed1ae8af9ca258ff1817a416721