Merge "Synchronize access to sNotificationBundle."
am: 729ae07a36

Change-Id: I07b54a6252348d998ea0b695f3817059c63e0364