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