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

Change-Id: I6f5a8803c4afe610728445b827a809bc809d94ef