Support latest MAM.

Change-Id: I17c4108d64bd40faddaaffdf271a1d403ca57829