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

Change-Id: I228813f2a79025b51c206cec920e1762b680212f