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