am f96d9c54: Merge "Improve resource loading by ~3x" into mnc-dev

* commit 'f96d9c5421b7df1c60024a0928639e18c6d96b7b':
  Improve resource loading by ~3x