mondrian: Import mdp changes from sm-t325