am 1429643f: am 97313955: Merge "Modification to the way boot classpath resources are loaded"

* commit '1429643f009108a16b91b313927d8aa08d17e9e7':
  Modification to the way boot classpath resources are loaded