Merge "Add MM#6 string overlay"
am: b53262c148

Change-Id: I1cbdba97bba4e0074c60ce374978ffb0b0cca8de