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

Change-Id: I857db2796c0a712ac19ecee21dbe5ccabbd50e18