Changes for redhat

Change-Id: Iffa4d51e68f4d13764fe8e6ce4f34f511f15291f
Merge "Changes for redhat"