Merge "Update strings for summary tip." into pi-dev
am: 0e7cff80ef

Change-Id: I4c891ea16e4fed831998cf609a5d5d2418528856