Apply MMAC changes from master.

Change-Id: Ief7a0aeb4433f5b642137c6aed24aeeb29d8e300