Merge "Wrap measurement optimization in targetSdk check" into klp-dev