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

Change-Id: Ie509b2878708ec1e7466679f503ec73cc9288206