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 am: 8dc83209
Change-Id: I3351d99c6e8df0e0426d607e9ab4400a1bc297cd