Merge "Expose MMS constants" am: 9681a661ae am: 102bafea2f

Change-Id: Ic7fbf24bbeb713585cd5143c58debb7f807a38ae