Merge "Expose MMS constants" am: 9681a661ae

Change-Id: I7f5fa3cd13087a3f0422c5d1d961fdcb5120baed