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

Change-Id: I9af6916577793f8f5700a217a3805a5937441327