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

Change-Id: Id85dd22241293b0f77b4d70e8f3391b6d4048f46