Test to hopefully fix MMS

Change-Id: Iba32bd866b5dae9c7c7f083971335c5a747ec2cc