[automerger skipped] Merge "Synchronize access to sNotificationBundle." am: 729ae07a36 am: 09087a83fa
am: ba27861b8a  -s ours

Change-Id: Ib5541152d01550c745f15a36acfebd2028d6b140