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