* commit '53a5e3175acb6e2bd23c25c1e4cba0789e47488f': Wrap measurement optimization in targetSdk check