Fix bugreport toast spam.

Change-Id: If6886089aa132694b6aad0a4d3d35646bffbed71
Merge remote-tracking branch 'cm/cm-11.0' into HEAD