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

Change-Id: Iaa3ef204cfc3aaf07f065a8dd07df28d643a9ce8