Merge "Remove NotificationVisibility storage pool" am: 24141e8124 am: cd2a7fb3b6
am: 8e96fe2c7f

Change-Id: I48d179b2e44b55541a5fe7b89d2daa1f7eeb5dd4