Some refactoring of mcomp functions.

Change-Id: Ic7a7cb1199b085e98ede0e634619b3077c348d57
3 files changed