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