Adding hp company affiliation changes

Change-Id: I3e99c27de65ce46895ada831a9efc238444d6c42
Merge "Adding hp company affiliation changes"