Mms: Because I am a material girl

Change-Id: If5b6c5d51511ab1a85d6e400ca960346fb2b6b3b
(cherry picked from commit be05596640d5bb0ea75a4cd59d0e855b3d62edfa)