am: e4735a9959 * commit 'e4735a99598bf29847a9f12dd7fae6d7df880bc4': Fix up some small resource issues
e4735a9959