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

Change-Id: Iaa7cf064e5944322643fa30e01599974eddc861f