Merge "Update system notification text" into pi-dev
am: a90868c525

Change-Id: If76acb25af7f3dd7ecd1b0ec5364c7123ff9e051