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

* commit '72e8e0807a8734cb65199ec0a92e9dc4db7a2588':
  Improve resource loading by ~3x