Merge "Check for text when adding CollectionInfo and CollectionItemInfo" into...
Merge "Check for text when adding CollectionInfo and CollectionItemInfo" into rvc-dev am: 38752980 am: 9f924154 am: 6c546f73
Change-Id: I8edb18aad547c846434602b6fee92623fd746fc0