Remove workaround code only needed for MW 1.20 and lower

Change-Id: Ifc256ccc144fab2a359dcd9ef0ae7be6751a471c
Merge "Remove workaround code only needed for MW 1.20 and lower"