Merge "Reset speakerphone at beginning and end of calls" am: f2910c6993 am: 322d648197
am: 21324c3bdb

Change-Id: Iab2f273be640b8c99e075fb609d2dc819796c950