Merge "Fix notification description" am: 0b14b27387
am: d661a63ef8

Change-Id: I5ffcbd23704f3178def3bbdf3fb0aafdff1b2887