Added code to extract more stuff from the MM side.

Change-Id: Idac63afad166c781ec3e59dda52b5cdbeb6dc141
updates

Change-Id: I779681cd9869870c5acb7036a182f5da8e914490