toro: Reconcile mms overlay w/ CM

Change-Id: Ic8a16525234ef77383144c9407e6414a3485c92f