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

Change-Id: I6d99978865daf1aed9b0ae9081b96d400901d564