Manually merging screenshot notification string changes to master.

Change-Id: I35468b5e641078d772c19505765db90adea2445b
1 file changed