manual merge
of https://github.com/madvertise/madvertise-android-sdk/pull/16