Merge "Update targetSdkVersion check." into lmp-dev