Merge "Merge "Revert "Add extra strings for 'tomorrow' text"" into pi-dev am:...
Merge "Merge "Revert "Add extra strings for 'tomorrow' text"" into pi-dev am: 4e83874b" into pi-dev-plus-aosp
am: 0109d9fc
Change-Id: I512b9753ec850fc450f6ab2a25e1da152731dcdb