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

Change-Id: Ic35c6e7203f7b693ab67664d692d9d82840a9997