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