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

Change-Id: I1b62dbfbd8f7398b62a7479d6c75648853463a37