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

Change-Id: Ibcb4e5ca1fd7f0d4059f73852daebbe121d62419