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

Change-Id: I10f10944989f058fdc441d85314f33244522aeed