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