Merge "Do not truncate onboarding tip text." into pi-dev
am: 8ac5fc68a9

Change-Id: I0d60205f76d774d670111981714718611e0dafcf