Merge "Use shorter string for MasterClear to stop truncating title" into pi-dev
am: 4d6375e052

Change-Id: I08afa778d2a7a6af1cbcf3493077c964caa8d5c1