Merge "Revert "Change version checks to use SdkLevel.isAtLeast*"" into tm-dev