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

Change-Id: I1dedbdc138f8abeb1653e67f534adf3949d24a2c