Merge "Update notification display buckets." into rvc-dev am: fff2d76ccb

Change-Id: If69b72f46da3e4fa53c49c1bf8629592fa54172c