Merge "Lock in final resource IDs." into lmp-dev