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

* commit '074b3ceb847ba2d9c9795b730c54a27ba412f158':
  Improve resource loading by ~3x