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

Change-Id: I192d210411b99a9cb1275a8a6799784dfc03f724