Apply MMAC changes from master.

Change-Id: I7ac4b0c91d21c5ee714f1dc218cc69ff2652dcde