Changes are applicable for both ubuntu and centos

Change-Id: I4b89ce680c36239ab15c9ff75896cda6fdd117f5
Merge "Changes are applicable for both ubuntu and centos"