Merge "Fix name in partial convo guts" into rvc-dev am: 966c3e957d am: f55f07186d

Change-Id: Ic8593afdb44615d194172db47abd69d2b7d5c532