Merge "Handle apps that upgrade to full conversations" into rvc-dev am: 01ae9d5c22

Change-Id: Ic8b81e6d967bbdaf257318fe5115f12339716e8f