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

Change-Id: Ice97927d55a7c6bf867bcb136bf661243b572c19