Merge "Update CHAR LIMIT for notification body." into nyc-mr2-dev
am: e553cebbeb

Change-Id: I390db320ba7139dcc96f361ce4f850b8125482b9