Add workaround code to fix mdp bug

Change-Id: Ie568582962921210712497d207bc31d6876d8e0c