Merge "Check for text when adding CollectionInfo and CollectionItemInfo" into rvc-dev am: 387529809d am: d999d87aac

Change-Id: Ib0835f545d9e980f1a3252c74482b650ef0518b8