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

* commit '5d84b44b416b5efd2d138c36e691d43396c1c1d8':
  Improve resource loading by ~3x