Merge "Update screenshot saving strings." into pi-dev
am: 644ded01dd

Change-Id: I9a14a9763a7e4bb9bba9df843da18b48057d4389