Merge changes Idd7d86f9,I73569744

* changes:
  Do not enable changes newer than the current sdk
  Add support for loading a static overrides file located in /product.