[DO NOT MERGE] Moar MM temp fixes.

Change-Id: I5ee222c60c82b2d01d3ce9e7c0f0085f07e52f41
2 files changed