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