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

Change-Id: I48176f04ed13df0978e64f3f1916c3bd00fe8ee2