Merge "Fix NullPointerException in PresencePublication" am: 702a34baba

Change-Id: I6b6e871c0f2275eb67882f7f216a4b0f94055a97