Merge "Add brandOverride back to IccRecord" into qt-qpr1-dev am: 61833e108e
am: 883b983e03

Change-Id: If848c612f3159420d6997289cb1c5dee49313530