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

Change-Id: Iae59b0a5ba5840a3f96ab0b446508cd0ae9cc199