Merge "Add MM#6 string overlay" am: b53262c148 am: 939db64461
am: 8d6a7d9ffa

Change-Id: I558d0a8e148305bfcc7c6adb762d50d091b1782e