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