Apply MMAC changes from master.
Change-Id: I01f2a9084dfe7886087b1497070b0d7f2ad8477e