Merge "Fix crash issue due to NPE when two calls are merged" am: 9296aa05bc am: 152dbfaa53
am: bafcfbe778

Change-Id: I48b0adfc8a9c426d088a8a37269e3b7cf8bb80b0