Merge changes I61178def,I536e8934

* changes:
  Flip feature flag to enable StrictMode defaults.
  Narrower StrictMode defaults.