Merge "Suppress the wtf log for notifications that are expected" am: bca9bceffb am: 4e3761e1d9 am: 1bb46d0637
am: 542d8a30c1

Change-Id: I91b92249dc7905aadbc59df50c3bc6da30a8590e