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

Change-Id: I5a72480ebece7480617c27a86174e95aad9c861b