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