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

Change-Id: Ibb2e48ae29675cb4c907249187ad95af7f427a09