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

Change-Id: I91358c2990a0719e84737ad2b8c64f6c1243cb96