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

Change-Id: I13c68b706f51402d656cf0ecd90ecd236b0ddde0