Merge "Add UX string tweaks before string freeze." into pi-dev am: 4b46d3e1e4
am: 14b8c28178

Change-Id: Ib61341cf1dcc40a34df686acdd88a1bc60eec018