Merge "Set correct targetSdkVersion for DevelopmentSettings" into jb-mr1-dev