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

Change-Id: I6e72df6adfc3a7ce78f08bb24e17717551efcedf