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

Change-Id: Ie0eaed7be80819484a41bca5a0bd396138f5870f