Merge "Merge "Don't override targetVers with minCode" am: 3b0eba4499 am: 234a906ee1 am: d5f926ba79"