Merge "Hide some previously exempt notifications" into pi-dev
am: afbc128d57

Change-Id: I05f866352f64ad7ddfc0534bdf84ce118a94212f