This reverts commit fa1f5094d1. Reason for revert: MBDRC solution merged, revert the tuning back Bug: 205934425 Change-Id: I431a1a9117d6c10416c0f94b33643480815e583b
fa1f5094d1