Changes for redhat

Change-Id: I608c1868bfcef071ab9c4cc151b7b96520cff579