Merge "Add brandOverride back to IccRecord" into qt-qpr1-dev