Merge "Fix FATAL Exception in PostCallActivity" am: 4b2da35108 am: 35c12ca943 am: 8d3f2dc70e

Change-Id: I73dac7ae2ee37068fd342aefb2426f8b85f56ab1