Merge "Merge "Check for text when adding CollectionInfo and...
Merge "Merge "Check for text when adding CollectionInfo and CollectionItemInfo" into rvc-dev am: 38752980 am: d999d87a" into rvc-d1-dev-plus-aosp am: 7c63ae8b am: 8f80771b
Change-Id: Ib0953d10df9d56b354ecf77fbf4b68f4bbaabd24