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

Change-Id: I9a024644f81a62bd5cfce912e96bb37320cdab31