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

Change-Id: I48476d4c4be6780ee316a65a048172d557e4b151