Merge "Add conversations image resource" into rvc-dev am: a3160941e2
am: 956d0265fe
am: 83aca81aad
am: 5d96b15c65
Change-Id: I930d20e55209d5e3e788e117b906d1799707e3b9
This commit is contained in: