Change-Id: I0ad320848ad6eb36dfe358fe858a3d5f1f42dbcf
Make it easier to be included and integrated into other code. Change-Id: I609881688cc20f8fac676cbd91fde4753af32ee5