Merge "Fix constructors for SearchIndexableData and SearchIndexableResource"