am ff762299: Merge "Small fixes and cleanup of resource config handling." into honeycomb-mr2

* commit 'ff7622992f39d8e401ab23c5ce6a84f318906e52':
  Small fixes and cleanup of resource config handling.